From: Asias He <asias.hejun@gmail.com>
Date: Sat, 19 Mar 2011 01:55:28 +0000 (+0800)
Subject: Merge commit 'upstream/0.2.0'
X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~235
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c76817f31fc0748d47e3999e22857d52143c153b;p=opencc.git

Merge commit 'upstream/0.2.0'
---

c76817f31fc0748d47e3999e22857d52143c153b